fix data
improve UI