Fixed some css
Merge origin/master