more css tweaks
fix merge conflict