refactoring + logo image uploader fix