Fixed the button issues as well as the issue in the ticket