polish(report): combine normal metric add modal and combined metric add modal into only one modal with tabset to toggle