Fix unsightly controll button spacing