More Tweaks

Few more tweaks on the demo