Fiexd some bugs of the UI...