Finished main styling.
Merge branch 'styles'