Adding badge and stuff