Made some changes to take proper control of scroll