Finished file layout updates