New demo included, some UI fixes