change layout to clean up