organize is-current rules better + formatting
update the DOM in one go
remove hard coded class names