Refactor workbook navigation