Bugfixes for broken view