Revised controller mapping and enhanced UI