Fixes in ejs layout. Improvments in the production state