Changed layout to new layout