Incorporating layout. Removed old configuration.