Fix 404 pages
Merge branch 'not-found-page'