some amendments in UI