Control bar fixes