Added checks on badges and front controller update