Added buttons and additional UI elements