Main view redesign

Merging to master, this redesign is largely complete