Changes positioning of active class
Adds filtering to the year tabs
Fixes merge