Improvements to user views, cleaned up some template code