MAJOR - tweaks to the layouts to include the base