Included User items. Made less changes for site design.
Merged Sonya's branch.