added map layer, added option for showing diagrams