Adding Validation & UI improvements