Made a few changes to the choices, and fixed the layout of the form