added badges and fixed flipper