Made a couple more fields conditional to clean up ui. Cleanup conditional syntax.