Code refactoring
New logo
support