Fixed scrollbar related issues