[#51] More spacing and badge fix