More Makefile improvements
Massive refactor to actually start using new UI