fix css error
Merge branch 'fixbug' into develop