Fix GFS Layout