Added some validations fixes and UI changes