some adjusted for new front end editor

Signed-off-by: Norik Davtian <norik@bigemployee.com>