Menu URLs still wrong, maybe this time (#16)