Minor fixes in Layout