website include support and refactoring