Refactor viewnavigator

I think this group is not needed