updated layout and scaffold