refactor(watchPage): restructure