UI Updated
UI Updated
JS validation added