Current DZ highlighting in the menu
Refine custom/current location consistence
Correct custom location persistence