some bugs and UI