Add wards to the Places menu and reorder the menu

It makes more sense to me to go from the largest areas to
the smallest going down the menu.
Merge branch 'master' into production