Fix back button & modified profile