rework layout to fit more naturally