Added better default layout