Fixed bug and added tracking to other links