Added input validators
Improved UI