some code cleanup, some work on single item display.

Signed-off-by: William Rockwood <wrockwood@tadl.org>