Finished cleaning up and fixing the HTML