move creating a user to layouts, lots of content changes on the other posts
resolve conflicts from Mark