CSS tweaks
Merge with newest changes, small coloration CSS changes