Refactored many smaller classes and the whole of SiteInfoPanel