Added some validations and tooltip to app