Some visual tweaks, plus fixes bug causing some fields left unlocked
when they shouldn't be.