remove dependency on th-text and width property
remove dependency on th-text
remove red border
fix merge conflict