Refactoring, logo changes