Carry on with document viewer and tab viewer refactoring