fix numerous UI details, model, and deadlock problem