Cleaned the code and corrected minor bugs.
Corrected a few minor bugs.
Made icon compatible for retina displays.