merged yellow and red indicators, moved priority circle next to yellow and switched order