added analytics styling and other stuff
merged conflicits solved