Revert "Revert "style new markup layout""

This reverts commit 527c017c022cbbe664ea370f830fa640f7d668ab.