Updating current location and fixing links