Revert "Revert "Updated default site manager controller""

This reverts commit 98d5f913be0648951ed67b76ef477b5f8a8ae3e4.