Not found page example and minor refactoring