updated navigation
updated template and 404 page