#116 user acceptance test
refactoring code on view
Merge pull request #237 from DonutWorks/test/acceptance-user

#116 user acceptance test