Refactored demo, fixed ribbon