many changes in ui package
modified till time