Add nextpage, button and associated tests