Filling in layout

Great improvements by Mr. Parker