Starting to remove the ViewFlipper and simplify the view hierarchy.