css tweaks
fix stupid merge conflict