Some retina images added. Code refactored