Global refactoring + new pages