Some little changes in UI