Rearranged demo settings

Change-Id: I375d4bad355003f11d35369be16579fb53274929