Enhance demo webapp