Fixed badges and other minor changes