Clean up and simplify thread display logic