Updated basic layout.