Modified these files to display the buttons in correct order