More pages, refactoring, basic form implementation