Small mixups for handlebars - final polishes