Add Location to point screen if available;
Final ui fixes for point and gps layouts