Sample web refactored