The layout is starting to look good again.  Simplifying.