New attempt at prettying some of the html