Updated more validation and fixed some UI bugs.