Fixes several scroll bugs

Ok, maybe more than several. But they're all fixed now. Also changes the
"X" to an image.