fixing HTML bugs and adding badges in to a list for nicer rendering