Follow-up to UI capitalisation changes

Based on review of @dpvc.