Fix scrolling issues
Adjust buttons