Fixes up formatting around anchor tags

Does two things:

1. Fixes missing whitespace
2. Implements a somewhat scaled back version of #8