working analytics and signup page
fixed merge