reworking the buttons a bit