Threading issues fixed - close buttons removed.