Updated dist/demo (margins added to GridLayout)