Refactor header module to highlight selected item