Fixes for button listener