Clean up a couple things
Fix scrolling bug in Safari