Tidy up code
update targer sdk
Add check for location services, progress circle and comments