Feature/118 editing applications