cleaning up ui, validation still not working