Expanded layout file with new markup and css classes (for Bootstrap)