Hagai Tz
Fixed bugs few bugs that caused the app to crash.