Cleanup of existing design

Using CSS, amazing!