Fixed scroll button and cleaned up code more