UI tweaks, fixes for dev/test