Refactored generic thread views a little