Re-architect toolbar for better customization capabilities. Also use less real estate.