update ui
merge home update
update