Logo Fix and optimize