Interface tweaks and markup corrections.