forgot some layout changes; array values are now also the keys to keep searching simple