-----Improve-----
Refine UI
Add central validation