More bugfixes, view optimalisation