Outlining of controls and control codes

Closes #38