Minor cleanup of UI and threading