layout library updated by williamknauss