fixing a bit the markup so it is more appropriate.