refactored website