Fixed the scroll bar issue, etc