Fixed options menu
Merge branch 'EditProfileGUI'
Fixed activity