Fix profile + back button maybe
Merge remote-tracking branch 'origin/master'