Reorganize layouts so that we only have one layout with the base HTML
Add 404 page