UI tweaks
merge