Added done button base logic