css formatting

css formatting
Merge branch 'John'