Updated ContextView with changed Erik made.