Update dev system, new labels, mainCtrl for data