Added better layout config names.
Updated to use the new layout names.