improve UI
update components
merge and cleanup