move tracking code into page propper