Added new markup to basic layout