Map Update

Several changes made. Graphical and layer-wise.