css tweaks
fix merge conflict