Fixed scrolling issues with the buttons