404 error page added + refactoring