add active class to wrapper

commits were a little ropey due to rebase, so refactored the history a little