Added input validation
Improved UI