Settings changes, adding elements to demo