Improved code
Put links into the right class
Improved code