Fix and adjust interactions in profile page
Fix conflicts after merging MH-811 to dev