added data, fixed back button