ui rework
conflict