Refactored site to be dynamic