fixing buttons and modal