Code cleanup.
Small changes and bugfixes.
Changed npd image, added app icon.