Bugfixes for ContentView