UI tweaks, spec fixes