Fix images, Remove GPS service & Storage issue