New report layout

Depends on #45