updates due to base layout changes