Layouts is edited and gps tracking is fixed