Bring thread UI closer to new spec
Bring thread UI even closer to new spec