Regulate UI
Optimize code & fix bug