Changing layout to be like v3