remove global variable
Improve UI