add notice page and small refactoring