Enhance done button