Refactoring, and some placeholder pages