Restructuring the CSS

Commit before I try to write generic CSS for block, with specific
classes to handle just the differences