Better Retina display support, few fix and improvements