Merged Berners layout into repo