Updated to with new button configurations