Added analytics and button loading