Make Report and Analyzer look better