Fixed css import in layout demo.  Code cleanup.