Analytics done and fix links