[BUGFIX] Improve page.ts