some fixes for button