Landing page and refactoring