Various bug fixes and updated app icon