Updated website
Updated GA logic
Updated GA logic