Add logo image and cleanup some code