ContactListWindow refactoring and listenport update