Add tooltip and completed icon