Add thread choice view and other stuff