3.6/ross dining maps numbering

Retail numbering fixes and map popover workaround (since you cannot tell UIPopoverController to display within a certain frame)