Successfully smoke-tested 404 page
additional refactors