change Map menu into two separate buttons again (#108)