profilr ui changes
merge conflicts resolved