[REF] Refactor header active links mechanism amongst other cosmetic changes