Fixed margin and font size issues identified in #2626.
Merge pull request #2634 from pjackson28/fixpopupmenus

Fixed margin and font size issues identified in #2626