layout changes, mostly