Refacto demo + new demo for the new panels / layout classes