finishing up some more layout changes