Housekeeping and added definition popup