client-side validation fixes, UI fixes and improvements