Minor graphic updates/refactoring