Fixing issue #1 and fixing logo