Normalize recent changes to fit the overall design