Various UI tweaks, cleanup