Changed layout.

Changed files  to reflect slightly different layout.