Refactoring - separate out table page