Modified layout
Add info controler