working ui
merge conflict resolved