Toward green.
Refactorize to use layouts. 
+ Going green !
Update dependencies.
Container is now gone.
Cleanup