fixed display bug

if statement stops checking conditions when first true is found