Refactoring added datetimepicker scale

Proximity tracking completed