tweaking css
fixed merge conflict
Merge pull request #4 from Bgoat/css_tweaks

Css tweaks