Added some jumbotron code
Fixed merge conflicts with jumbotron code