Refactor out code duplication in Controller
NOBUTTON fix