re #722 - Refactored links to horizontal nav elements
re #722 - Pills should be underlined