Restored lost changes (edit_controller)
Reversed part of dynamic buttons