Added Analytics tracking code and some minor changes