Added empty-map-function to menu
Fixed conflictes