fixed remaining issues with views