Various changes: new graphic, UI opts, refactoring.