Feature/issue 121 badge order