Improve the layout variables + new container helper