Move badge; fix bug;