users views and some touch up on front page
conflicts resolved
merge conflicts resolved