fixed css bug
Merge branch 'stage'