Gui and Validation changes
Gui and validator changes