fixing buttons and refresh