mods to layout library:
more added to layout library