3.5 layout issue, cleanup