Fixed scoll and transition bug