Image handling fixes and logic changes. Added file not found toast