changed layout so all fits in one page and no stretching
more stretching fixes