css changes
Merge pull request #239 from chrismd3/chrisbranch

css changes
Merge branch 'master' into user-display-name+settings