Fixes DB + Logo + More refactoring