Added layout and marginalia