Unified demo
Rearranged demo
Fixed additionalClasses