Basic Layout

Updates to basic layouts.