More work on controls and components