Revert "Revert "Changed 404 page to use layout for easier customization""

This reverts commit 02259acf0c726d9e244472d2505569e8eda5a999.