Add layer selection and GPS