Removed scrollbar visibility handling and added a fix to a flicker problem