Demo layout load fix