More toolbar customization and related fixes.