Merge
Update css for demo