Removed the next buttons and fixed the setup layout