Refactored using nested selectors
Fixed demo's to use new class names.