Move badge to the top & update heading
Allow to using dependency injection in classes callback