merge
merge
UI scaling
more UI changes