Moved the gateway box to EditBox for Eoc

There are still errors to be fixed.
This is a first step for make
simpler the layout