Menu completed, some transitional code done