A more robust makefile. Still not bulletproof, unfortunately.
Reformatting to conform to style standards.
Finished changes to UI code. It compiles, but needs debugging.