jeff's latest layout tweaks

These are copied from the Google Drive version of the project