Collapsed margin definitions.

Margin definitions are now one line.
Further cleanup of CSS

Fixed up border definitions and also renamed/removed some classes.