updated controller and views
Merge pull request #14 from willtsay/e7chun

updated controller and views