tim's layout changes