Update layout code and examples.  Fix minor bug in LI.