Fix after layout changes