Active menu now properly highlighted