various bugfixes on views