#37 Viewplanner refactoring