Refine css and column layout.
fix merge conflict