Bugfixing stupid errors
With list view and some changes
Merge branch 'master' of https://github.com/skittle/TeamUp.git