Improve look and feel of demo