Bugfixing Model and View