+ added layout to output (almost) all data