start to change ui
merge