Wireframe styles, DRYing out code and cleanup