user profile layout edits, user edit layout edits
conflicts resolved