DA-70: Not a required part of the sub-task, but moved the buttons to a menu.
DA-70: Removed the buttons from XML.