Fix the tab and scrolling issues