Adding more layout changes