Fixed some of the CSS (still needs work)
Merge origin/master