Refactor controls
Set current