Replace pitch names with labels and fix focus bugs.