Move the rest of the buttons to the messages file.