A couple of layout changes and stability fixes