fix home and tracking