refractor css, make markup layout consistent