Add new control
Rename all the control components