Fixed bugs with page navigation and page confirmation, adjusted layout slightly