css tweaks
Resolving merge conflict with child.css