Minor changes

Changed the layout of the form slightly and also took Chuck's idea to
condense the code on the chaos of my if statements.