new dashboard html cleaned from conflicts