Added expanable buttons for analyitcs