Layout changes for demo