Tweaked default layout