Changes for scroll bar issue