Added 404 and fixed links