fixing markup and adding in a few icons