fixed alignment for profile pages
fixed merge conflicts