Changed around my HTMLs, still needs adaptation