Added more necessary HTML elements