Another major refactor; remove Layout-config and replace it with LayoutPageVariant