Minor formatting changes
Edited user page, clean up various forms
Merge branch 'dev' into model