fixing buttons and shit