ui changes and bug fix on item 1347