tracking code
cleanup
pimp up views