Cleanup TitlebarViewCont even more