Slight adjustments to cell prototypes.
Added several switch controls to test cell reuse.