desert milepost fix rectangle, map align titles and clean up
Merge with master