Refactored and fixed some errors
Add logo file