GUI works, ready for canvas
Minor changes to Map.cs for correctness.