layout changes.  still working...