Fixed scrolling and other styling changes and fixes