Report.html code improved