Prettier links
Fixed legacy link modification
Adapted for new design