Removed a bunch of test code that didn't do anything. Replaced the
comment ListView with a LinearLayout, since it's already nested inside
of a ListView and that would screw up scrolling.