ui update

-  UI improvement
- bug fixes