new layout production ready