Remove scroll and little fixes