Refactored a bit and improved sub sites a bit aswell.