default layout improved