Cleaned up AddSiteViewController