Changed the way that urls are decided upon
Added 404 page