Fix controls header level
Add name to controls