Refactoring demo for main site
Fixing issue with mediaquery listeners