UI tweaks, upgrade groundwork