[TASK] Cosmetic changes in Edit Controller