Add Some Changes For Multi Layout Support