Edit popup.html and improve index.html