Fix z-ordering
Support Retina
Commit