cleaned up main-view