Fix control button order