Fix possible null pointer exceptions
Add new Logo