Add labels and badges display + remove resources objective