Modified GPS Related classes and layouts