UI refactor to wireframe

Refactored ui code to match that of the project wireframes at https://cikl.mybalsamiq.com/projects/ciklui/grid.