Refactor view/edit tour