fix #171, completed migration module
fixed sidebar names in demo
Update with main repo