Few more tweaks 

1. Analytics added.