tweak layout
remove useless code
Merge remote-tracking branch 'sonata-project/master'