Update to layout and base files