code tweaks
active class and transtion