Made Changes to Site Manager

Changes to the base template and controller behavior.