added in some new view stuff to clean up