Added some more layout props