menu and jumbotron as one, new heeader for intermediate pages, some text changes