Added Demo Page + Small improvements