demo page dynamically generated, bug fixes