Cleaned up a few styles and fixed style.css
Merge branch 'refs/heads/development'

* refs/heads/development:
  Cleaned up a few styles and fixed style.css