Almost finish

1. modify UI
2. final check