Badge modified and bug fixed