Added better scrollbar handling