Merge pull request #542 from LoungeKatt/master

Make sure menu items are visible in layout
Switch to XML popup layouts to prevent size issues

This also adds text labels to the buttons for easier identification of
functionality