Fixed svg class override problem and made some minor device optimizing