Fix reading in layouts, ignore empty lines at file end