Some major edits and a new style for the demo template