Working on definition screen