Merging refactored site controller