Some improvements and removing scrollintoview becuase of resize issue