cleaned up views and made some code changes, fixed #9