Add: Map icon to menu, add subject link to menu