Begin updating UI
Merge remote-tracking branch 'Databox/master'