Working on templates... Demo styles updated