More GUI changes -- omni logo looks sort of ugly right now.
some refactoring