* Improved notification behavior
* Added notification if location is disabled
* Minor changes 
