Added more functionality and styling
Merge branch 'master' into views
Merge pull request #33 from oconn/views

Views