Revert b4778b8..836b049

This rolls back to commit b4778b87fec8d8f13f8447f288b6b59528fb1679.
Main view with subviews