Added heaps of user stuff and some css
Merged user stuff in with master