cleaned up the look, validation still works, problem with switch