some UI organization
merge conflicty

rty