Move paginator include and switch layouts