new changes to add the analytics, the buttons, and some hacks