fixes after layout changes