Better default layout
Better default layout
Better env checking