Update layout so that content is within bootstrap spans and rows