Added second page, implemented cancel buttons