master: Updated Form, Pagination, and Router