Added Analitycs + Layout