#12 and #13: CSS and HTML updates