Improved layout of control  buttons