Fixed improper link generation.
Improved display.