Change report layout

Further improvement needed later