Spread out menu html

The compact nature of this html was causing edit conflicts that are
harder to resolve, and generally making it harder to look at.  No
functional change, just whitespace.

Change-Id: I76eb5a0901cf94e48b6e39d2311b52aa3b766022