Menu links now properly highlighted when active, pagination quick fix