added conditionals to info panels