Updated names, fixed back button operations