Fix bugs

ui improvement