Move controls to shared project