Fixed remaining issues with demo design