updated ui
merge conflics