final fixes for badges