several fixes for content views