added some UI changed