Content Views: Reworking content views models and UI