Add back button in profile page when available
Fix conflicts