[Feature] ui polish and bugfix