Add chart stubs
Fix basic chart demos