Improve analitics tracking
Some styling changes