* Minor improvements in Layout