Image cleanup.
More image cleanup.
Redesign stopping point.