restuctured html a bit