Moved stuff around/ Updated maps.

Updated highway and fixed missing map icons.