Redesign and clean-up of UIBarButtonItems