Change MainActivity, RoutePointActivity, Fix bugs