feat(pages): fix implement + cleanup