Ft/Rf12808

Ghost User requested to merge ft/RF12808 into WIP

RF12808: Improve HTML structure

Merge request reports