Completed doc for users, DRYed up views