back button plus minor changes