Made a distinction between includes and pages, also moved widgets up to the root level and fixed an editor bug that recursively converted entities.