First go at moving controls to the bar