Finished changes in Layout