* De-Duplicated some fields * Use a container for the pitch controls * Name pitch related elements correctly