complete site, refactored