Refactor viewnavigator

I think you can remove this group as well