Replaced location service activation by layer additions. Location now

Replaced location service activation by layer additions. Location now activated by a button.