Added alternate layout, and new headers.