Demo style improvements