Link improvements

Improved links by getting rid of unused code as well as change it to fit recent styles.