Huge view cleanup across the board

Name says it all :dancers: