Demo changes

Fix issues discussed in layouts.