Replaced the menu in tracking.html and did some other small changes