Changed some HTML and added some additional queries