- add input validator
- visual improvement