#75 Some more refactoring of SiteController