STORM-474: Reformat UI HTML code