Refactoring some view variables
Fixing some bugs created due refactoring
Fixing more bugs created due refactoring
Merge branch 'master' of https://github.com/Kavospus/facilita
Fixing even more bugs created due refactoring