Scrolling and top bar fixes