Added TODOs to the demo and a few styles.