Optimize layout

Remove layoutexecutant