Add button to check the answer; a little cleanup