adding more layout support