Fix spacings and add badges