changed demo layout
merged conflicts