fix for thelayout and some links by display: block
conflict resolved