Improved layout

Mostly @Override addition
Merge pull request #1481 from pveentjer/improvement/3.x/executor-layout

Improved layout