Attempting some layout changes to start doing something usable