Re-arranged tools to get ready for icons, instead of text.