Remove unneeded nesting and make link colouring more specific