lots of layout changes, matching to print version