Shorthand CSS, minor layout improvements