Rearrange badges and fix mistake in config