Add next/back for buttons
Change layout to view question