layout redesign
fix css merge conflict