Updated html & exports