More style fixes in Segment/Tcb