UI & Validation Fix