Refactoring and bugfixes in views