updated layout to new layout