Changed a few things again, and fixed some links that were not displyed properly