JS enhancements and more GA tracking