progress on main view for shaun
Merge branch 'hendrik'