Various changes: new graphic, UI opts, refactoring.
updating with Alexs pushes from 4-20-2013