Main function map

Fixed #4 feature of main map