more UI changes
WIP
merge