More modals, and structuring the html a bit