Moved drawing functionality to MapModule. Corrected NullReferenceException when map is initialized.