Now using an expandable list. Works much better.