Move logic out of view
fix item usage
Merge branch 'master' of github.com:benphelps/Probably