Moved dashboard view into navgroup.
Patched merge conflit.