Restructure some html