Fix and adjust interactions in profile page
Merge branch 'MH-811' into dev