Added buttons and a more sophisticated message system