[WIP] View cleanup and redesign