#905 Split up thread markup and logic
#962 Improve Moderation tools