Some tweaks around control bar render