Revised controller buttons layout