Style change
Fixed asset js bug
Merge branch '2.0.2'