Added app icon and some clean up