Demo updates and minor layout changes