Feat: update type and pages
Feat: Update components