more cleaning up of the main view