Cleaned up code
Fixed scrolling bug