Remove Unicorn stuff
Fix active class