Fix issue btns