Fix build in master

These commits update the master tree to allow it to build against the latest tracker and libmx. UI has basic functionality, but I'm not sure if any of my changes broke anything in particular.