Issue #46: Order the elements in the UI to match the button layout