Partially updated with new HTML/CSS