Tool Palette improvements