Changed control's names
Added new controls