[IMP]Improved some UI