Some LocationButton Work and Cleanup