layout changes, cleanup