updated default layout to hopefully use the user variables...