Added general map layer, changed colors