Yay layout updates