add connect buttons and cleanup text