Previous commit fixed back button problems