Pre User page File Merge

Creating commit before I merge generateUserPageFor and userTemplate for
the user pages. Could get messy.