Moved controls to own class