UI tweaks. Still in flux.