Continued redesign of menu and toolbar