Fix some bugs.
adjust UI.
Merge branch 'design'