optimize performance and some UI change.