Re-work for HTML part. Stage 2.6/3