Visual tweaks and extra form labels