Fixing scrollbar issues