Add demo
Fix minor design etc.