Refactor controller widgets