Removed superfluous method override in Layout. Fixed Layout package membership.