Expanded the View-parts, more needed.