Switch to XML popup layouts to prevent size issues

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