WTP
refactoring the buttons
Refine the UI style and fix bugs