Refactoring + new fonts + new logo