Some specs for sites + refactoring