more views and cleaning up some files