Improved candidates tab close #2