More styling and CSS
Merge branch 'users'
Added more styling
Merged with Mo's branch