Improve some UI of original version