restructured html a bit