Transition and js fix