Code cleaned and refactored.
Added app icon.