[#DISCAPP-4: Improve editor controls to extend more]