Restyle demo a bit more