Demo page redesign, structure changed