Merge "Separate content from presentation for user tools list"