Refactored Site controller