Refactor viewnavigator

I think you can get rid of this group