Adjusted phrasing for buttons
Fixed problem with wizard